Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 10 Apr 2011 15:49:40 +0000 (08:49 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 10 Apr 2011 15:49:40 +0000 (08:49 -0700)
commitd23661ce3a9e2c80ecb25750a476ac78f8897142
tree902f7d70c16b9f36d98df2a5d3aa211cfa38c3e6
parent6f5d55c41e2915b012e3972bb71dead265d8fcac
parentcf5fa73e17f3209238a60aaeab9cd2cfba1815cd
Merge from mainline.
lisp/ChangeLog
src/ChangeLog